From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Mon, 15 Mar 2010 01:43:38 +0000 (+0000)
Subject: Merge from mainline.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~8376^2~4
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=1a1e7a0ca904c8eef3c16b4c83867df35a16a118;p=emacs.git

Merge from mainline.
---

1a1e7a0ca904c8eef3c16b4c83867df35a16a118